From 4fbfbb8682310993b9e56a1e34a430fc3dcf188c Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Mon, 26 Jul 2004 15:10:13 +0000 Subject: [PATCH] bitkeeper revision 1.1108.17.2 (41051ed51JmSlgJg-SSNXffJxH783g) Change panic() to BUG() in a few places. --- linux-2.4.26-xen-sparse/arch/xen/mm/hypervisor.c | 5 ++++- linux-2.4.26-xen-sparse/include/asm-xen/hypervisor.h | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/linux-2.4.26-xen-sparse/arch/xen/mm/hypervisor.c b/linux-2.4.26-xen-sparse/arch/xen/mm/hypervisor.c index 6a31649392..da4e9ce3ac 100644 --- a/linux-2.4.26-xen-sparse/arch/xen/mm/hypervisor.c +++ b/linux-2.4.26-xen-sparse/arch/xen/mm/hypervisor.c @@ -120,7 +120,10 @@ static inline void __flush_page_update_queue(void) idx = 0; wmb(); /* Make sure index is cleared first to avoid double updates. */ if ( unlikely(HYPERVISOR_mmu_update(update_queue, _idx, NULL) < 0) ) - panic("Failed to execute MMU updates"); + { + printk(KERN_ALERT "Failed to execute MMU updates.\n"); + BUG(); + } } void _flush_page_update_queue(void) diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/hypervisor.h b/linux-2.4.26-xen-sparse/include/asm-xen/hypervisor.h index 18051de97c..fcafd5429c 100644 --- a/linux-2.4.26-xen-sparse/include/asm-xen/hypervisor.h +++ b/linux-2.4.26-xen-sparse/include/asm-xen/hypervisor.h @@ -383,9 +383,12 @@ static inline int HYPERVISOR_update_va_mapping( "b" (page_nr), "c" ((new_val).pte_low), "d" (flags) : "memory" ); if ( unlikely(ret < 0) ) - panic("Failed update VA mapping: %08lx, %08lx, %08lx", - page_nr, (new_val).pte_low, flags); - + { + printk(KERN_ALERT "Failed update VA mapping: %08lx, %08lx, %08lx\n", + page_nr, (new_val).pte_low, flags); + BUG(); + } + return ret; } -- 2.30.2